Don't size-allocate invisible headers
authorMatthias Clasen <mclasen@redhat.com>
Thu, 9 Jun 2011 22:55:19 +0000 (18:55 -0400)
committerMatthias Clasen <mclasen@redhat.com>
Thu, 9 Jun 2011 22:55:19 +0000 (18:55 -0400)
We don't ignore their size requests when determining the
column width, so allocating them is bound to spew tons
of annoying underallocation warnings.

gtk/gtktreeviewcolumn.c

index cb04b1b280039545d8952961efd02c285915da17..bd8cebe18e05a9f3f9e564da3cb0b6950f0ef9d9 100644 (file)
@@ -2117,12 +2117,15 @@ _gtk_tree_view_column_allocate (GtkTreeViewColumn *tree_column,
 
   gtk_cell_area_context_allocate (priv->cell_area_context, priv->width - priv->padding, -1);
 
-  allocation.x      = x_offset;
-  allocation.y      = 0;
-  allocation.width  = width;
-  allocation.height = _gtk_tree_view_get_header_height (GTK_TREE_VIEW (priv->tree_view));
+  if (gtk_tree_view_get_headers_visible (GTK_TREE_VIEW (priv->tree_view)))
+    {
+      allocation.x      = x_offset;
+      allocation.y      = 0;
+      allocation.width  = width;
+      allocation.height = _gtk_tree_view_get_header_height (GTK_TREE_VIEW (priv->tree_view));
 
-  gtk_widget_size_allocate (priv->button, &allocation);
+      gtk_widget_size_allocate (priv->button, &allocation);
+    }
 
   if (priv->window)
     {